From 5eb4a3af0d3135348763d3c6de51f1c1006e2604 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 24 Dec 2022 09:01:16 -0500 Subject: [PATCH] filedialog: Handle initial-folder being NULL This showed up as test failure in ci. --- gtk/gtkfiledialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkfiledialog.c b/gtk/gtkfiledialog.c index f46341fabc..6f1a0dada2 100644 --- a/gtk/gtkfiledialog.c +++ b/gtk/gtkfiledialog.c @@ -674,7 +674,7 @@ gtk_file_dialog_set_initial_folder (GtkFileDialog *self, if (!g_set_object (&self->initial_folder, folder)) return; - if (self->initial_name) + if (self->initial_name && self->initial_folder) { g_clear_object (&self->initial_file); self->initial_file = g_file_get_child_for_display_name (self->initial_folder, @@ -725,7 +725,7 @@ gtk_file_dialog_set_initial_name (GtkFileDialog *self, if (!g_set_str (&self->initial_name, name)) return; - if (self->initial_name) + if (self->initial_name && self->initial_folder) { g_clear_object (&self->initial_file); self->initial_file = g_file_get_child_for_display_name (self->initial_folder, -- 2.30.2